Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fix logql analyzer #14511

Merged
merged 13 commits into from
Oct 17, 2024
Merged

ci: fix logql analyzer #14511

merged 13 commits into from
Oct 17, 2024

Conversation

trevorwhitney
Copy link
Collaborator

What this PR does / why we need it:

Fix the LogQL Analyzer CI

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@trevorwhitney trevorwhitney requested a review from a team as a code owner October 16, 2024 22:32
@pull-request-size pull-request-size bot added size/M and removed size/S labels Oct 16, 2024
@pull-request-size pull-request-size bot added size/S and removed size/M labels Oct 16, 2024
Copy link
Contributor

@vlad-diachenko vlad-diachenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Signed-off-by: Vladyslav Diachenko <[email protected]>
@vlad-diachenko vlad-diachenko merged commit 3117974 into main Oct 17, 2024
60 checks passed
@vlad-diachenko vlad-diachenko deleted the logql-analyzer-ci-2 branch October 17, 2024 14:49
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 17, 2024

The backport to release-3.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-14511-to-release-3.2.x origin/release-3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 311797442f0a402b388904ee346f4ee411e8ab03

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-14511-to-release-3.2.x
# Create the PR body template
PR_BODY=$(gh pr view 14511 --json body --template 'Backport 311797442f0a402b388904ee346f4ee411e8ab03 from #14511{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'ci: fix logql analyzer (backport release-3.2.x)' --body-file - --label 'size/S' --label 'type/bug' --label 'backport' --base release-3.2.x --milestone release-3.2.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-14511-to-release-3.2.x

# Create a pull request where the `base` branch is `release-3.2.x` and the `compare`/`head` branch is `backport-14511-to-release-3.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-14511-to-release-3.2.x

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 17, 2024

The backport to release-3.1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-14511-to-release-3.1.x origin/release-3.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 311797442f0a402b388904ee346f4ee411e8ab03

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-14511-to-release-3.1.x
# Create the PR body template
PR_BODY=$(gh pr view 14511 --json body --template 'Backport 311797442f0a402b388904ee346f4ee411e8ab03 from #14511{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'ci: fix logql analyzer (backport release-3.1.x)' --body-file - --label 'size/S' --label 'type/bug' --label 'backport' --base release-3.1.x --milestone release-3.1.x --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-14511-to-release-3.1.x

# Create a pull request where the `base` branch is `release-3.1.x` and the `compare`/`head` branch is `backport-14511-to-release-3.1.x`.

# Remove the local backport branch
git switch main
git branch -D backport-14511-to-release-3.1.x

trevorwhitney added a commit that referenced this pull request Oct 17, 2024
Signed-off-by: Vladyslav Diachenko <[email protected]>
Co-authored-by: Vladyslav Diachenko <[email protected]>
(cherry picked from commit 3117974)
trevorwhitney added a commit that referenced this pull request Oct 17, 2024
Signed-off-by: Vladyslav Diachenko <[email protected]>
Co-authored-by: Vladyslav Diachenko <[email protected]>
(cherry picked from commit 3117974)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants